From 16e91d003618ac01c5b413baae4d14876587c203 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20Davidovi=C4=87?= Date: Wed, 24 Dec 2014 05:50:01 +0100 Subject: [PATCH] Fix tests --- Cargo.lock | 1 + tests/support/mod.rs | 4 ++-- tests/support/registry.rs | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c54edbd8c..0365deba3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -160,6 +160,7 @@ name = "registry" version = "0.1.0" dependencies = [ "curl 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/tests/support/mod.rs b/tests/support/mod.rs index 6ac5ef487..4b7b949ce 100644 --- a/tests/support/mod.rs +++ b/tests/support/mod.rs @@ -301,9 +301,9 @@ impl Execs { None => ham::success(), Some(out) => { let actual = match str::from_utf8(actual) { - None => return Err(format!("{} was not utf8 encoded", + Err(..) => return Err(format!("{} was not utf8 encoded", description)), - Some(actual) => actual, + Ok(actual) => actual, }; // Let's not deal with \r\n vs \n on windows... let actual = actual.replace("\r", ""); diff --git a/tests/support/registry.rs b/tests/support/registry.rs index 3fac53dcb..3fd6cf091 100644 --- a/tests/support/registry.rs +++ b/tests/support/registry.rs @@ -3,7 +3,7 @@ use std::io::{mod, fs, File}; use flate2::CompressionLevel::Default; use flate2::writer::GzEncoder; use git2; -use rustc_serialize::hex::ToHex; +use serialize::hex::ToHex; use tar::Archive; use url::Url; -- 2.30.2